bitkeeper revision 1.1405 (4284f1eblDv0pt9WRByVi3DRdlLGSA)
authorsmh22@firebug.cl.cam.ac.uk <smh22@firebug.cl.cam.ac.uk>
Fri, 13 May 2005 18:28:59 +0000 (18:28 +0000)
committersmh22@firebug.cl.cam.ac.uk <smh22@firebug.cl.cam.ac.uk>
Fri, 13 May 2005 18:28:59 +0000 (18:28 +0000)
Merge firebug.cl.cam.ac.uk:/local/scratch/smh22/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/smh22/mwray-xend2.bk


Trivial merge